projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6eab393 c0ba590)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:35:41 +0000 (14:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:35:41 +0000 (14:35 -0800)
commit2c82deee7fbb951a90ed3246350fbf9390af038a
tree465aaf0fdaefea778317ab1ed5c48400f223b596tree | snapshot
parent6eab3936c71951e304f13b69ad2e835ddaf9f2f4commit | diff
parentc0ba5908b117170995df36e839a087af7c5f79dbcommit | diff
Merge from origin/emacs-24

c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done  (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode  (Bug#19763)

Conflicts:
admin/ChangeLog
doc/misc/ChangeLog
doc/misc/erc.texi
lisp/ChangeLog
src/ChangeLog
admin/ChangeLog diff1 | diff2 | blob | history
admin/MAINTAINERS diff1 | diff2 | blob | history
doc/misc/ChangeLog diff1 | diff2 | blob | history
doc/misc/erc.texi diff1 | diff2 | blob | history
lisp/ChangeLog diff1 | diff2 | blob | history
lisp/comint.el diff1 | diff2 | blob | history
src/ChangeLog diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.